Merge remote-tracking branch 'origin/master' into feature/pgtk

author Po Lu <luangruo@yahoo.com>

Sat, 4 Dec 2021 12:34:08 +0000 (20:34 +0800)

committer Po Lu <luangruo@yahoo.com>

Sat, 4 Dec 2021 12:34:08 +0000 (20:34 +0800)
author Po Lu <luangruo@yahoo.com>
Sat, 4 Dec 2021 12:34:08 +0000 (20:34 +0800)
committer Po Lu <luangruo@yahoo.com>
Sat, 4 Dec 2021 12:34:08 +0000 (20:34 +0800)
diff --cc Makefile.in
Simple merge
diff --cc src/image.c
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sat, 4 Dec 2021 12:34:08 +0000 (20:34 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sat, 4 Dec 2021 12:34:08 +0000 (20:34 +0800)
		1	2
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/image.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history